x11: Don't include gdkinternals.h

diff --git a/gdk/x11/gdkcairocontext-x11.c b/gdk/x11/gdkcairocontext-x11.c
index 3409e30b9792d54cf748c628612c09a81c89dded..36bf1ae0ba8c0405480e5767a9731191f36c0d4a 100644 (file)
--- a/gdk/x11/gdkcairocontext-x11.c
+++ b/gdk/x11/gdkcairocontext-x11.c
@@ -26,7 +26,6 @@
 
 #include "gdkcairo.h"
 #include "gdksurfaceprivate.h"
-#include "gdkinternals.h"
 
 #include <X11/Xlib.h>
 

diff --git a/gdk/x11/gdkdevice-xi2.c b/gdk/x11/gdkdevice-xi2.c
index d59dc37612a4064463e8ecbb78f3c7f65758e6d2..5976dfafc486dcdb9f47b39a85bd37c77f95dcee 100644 (file)
--- a/gdk/x11/gdkdevice-xi2.c
+++ b/gdk/x11/gdkdevice-xi2.c
@@ -278,6 +278,27 @@ gdk_x11_device_xi2_query_state (GdkDevice        *device,
   free (button_state.mask);
 }
 
+static GdkGrabStatus
+gdk_x11_convert_grab_status (int status)
+{
+  switch (status)
+    {
+    case GrabSuccess:
+      return GDK_GRAB_SUCCESS;
+    case AlreadyGrabbed:
+      return GDK_GRAB_ALREADY_GRABBED;
+    case GrabInvalidTime:
+      return GDK_GRAB_INVALID_TIME;
+    case GrabNotViewable:
+      return GDK_GRAB_NOT_VIEWABLE;
+    case GrabFrozen:
+      return GDK_GRAB_FROZEN;
+    default:
+      g_assert_not_reached();
+      return 0;
+    }
+}
+
 static GdkGrabStatus
 gdk_x11_device_xi2_grab (GdkDevice    *device,
                          GdkSurface    *surface,
@@ -332,7 +353,7 @@ gdk_x11_device_xi2_grab (GdkDevice    *device,
 
   _gdk_x11_display_update_grab_info (display, device, status);
 
-  return _gdk_x11_convert_grab_status (status);
+  return gdk_x11_convert_grab_status (status);
 }
 
 static void

diff --git a/gdk/x11/gdkdevicemanager-x11.c b/gdk/x11/gdkdevicemanager-x11.c
index c98faa711f45e5a390b2dda3bc5c889bc4ab7116..c7b9743be016cf40dc1bb99609be33da2330b9f4 100644 (file)
--- a/gdk/x11/gdkdevicemanager-x11.c
+++ b/gdk/x11/gdkdevicemanager-x11.c
@@ -18,7 +18,6 @@
 #include "config.h"
 
 #include "gdkx11devicemanager-xi2.h"
-#include "gdkinternals.h"
 #include "gdkprivate-x11.h"
 #include "gdkdisplay-x11.h"
 

diff --git a/gdk/x11/gdkdevicemanager-xi2.c b/gdk/x11/gdkdevicemanager-xi2.c
index 07073ee39560efdf392b8ded2580c558ed48fc94..e4114e52796ae99ce504f016fa3df7c795870c21 100644 (file)
--- a/gdk/x11/gdkdevicemanager-xi2.c
+++ b/gdk/x11/gdkdevicemanager-xi2.c
@@ -23,13 +23,13 @@
 #include "gdkdeviceprivate.h"
 #include "gdkdevicetoolprivate.h"
 #include "gdkdisplayprivate.h"
+#include "gdkeventsprivate.h"
 #include "gdkeventtranslator.h"
 #include "gdkkeys-x11.h"
 #include "gdkprivate-x11.h"
 #include "gdkdisplay-x11.h"
 #include "gdkintl.h"
 #include "gdkkeysyms.h"
-#include "gdkinternals.h"
 #include "gdkseatdefaultprivate.h"
 
 #include <X11/Xlib.h>

diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c
index a03690c788c6082a6b83820c7f7af0331849a74f..6e5fd276f7cca6bd70666fc209b38e141134a5ac 100644 (file)
--- a/gdk/x11/gdkdisplay-x11.c
+++ b/gdk/x11/gdkdisplay-x11.c
@@ -29,10 +29,10 @@
 
 #include "gdkasync.h"
 #include "gdkdisplay.h"
+#include "gdkeventsprivate.h"
 #include "gdkeventsource.h"
 #include "gdkeventtranslator.h"
 #include "gdkframeclockprivate.h"
-#include "gdkinternals.h"
 #include "gdkdeviceprivate.h"
 #include "gdksurfaceprivate.h"
 #include "gdkkeysprivate.h"

diff --git a/gdk/x11/gdkdisplay-x11.h b/gdk/x11/gdkdisplay-x11.h
index 2a7356f752b2a6342597f44ebe50cbd6733f414d..78aece41779032e4bb0dd2aae046f330f0dc73fd 100644 (file)
--- a/gdk/x11/gdkdisplay-x11.h
+++ b/gdk/x11/gdkdisplay-x11.h
@@ -25,7 +25,6 @@
 #include "gdkdisplayprivate.h"
 #include "gdkkeys.h"
 #include "gdksurface.h"
-#include "gdkinternals.h"
 #include "gdkx11devicemanager.h"
 #include "gdkx11display.h"
 #include "gdkx11screen.h"

diff --git a/gdk/x11/gdkdrag-x11.c b/gdk/x11/gdkdrag-x11.c
index 1bd75b37cb483e6392e4c81f6f6793d312085410..5804085a5694e3101956277bf355923ef8a776e2 100644 (file)
--- a/gdk/x11/gdkdrag-x11.c
+++ b/gdk/x11/gdkdrag-x11.c
@@ -34,11 +34,12 @@
 #include "gdkdevice-xi2-private.h"
 #include "gdkdisplay-x11.h"
 #include "gdkdragprivate.h"
+#include "gdkeventsprivate.h"
 #include "gdksurfaceprivate.h"
-#include "gdkinternals.h"
 #include "gdkintl.h"
 #include "gdkprivate-x11.h"
 #include "gdkscreen-x11.h"
+#include "gdkseatprivate.h"
 #include "gdkselectioninputstream-x11.h"
 #include "gdkselectionoutputstream-x11.h"
 

diff --git a/gdk/x11/gdkdrop-x11.c b/gdk/x11/gdkdrop-x11.c
index 3470382da7d536c39c2ec97684755bc5a3933529..91987fad13989f3b7087b1af3e3903c74eb2a229 100644 (file)
--- a/gdk/x11/gdkdrop-x11.c
+++ b/gdk/x11/gdkdrop-x11.c
@@ -33,7 +33,6 @@
 #include "gdkdeviceprivate.h"
 #include "gdkdisplay-x11.h"
 #include "gdkdragprivate.h"
-#include "gdkinternals.h"
 #include "gdkintl.h"
 #include "gdkprivate-x11.h"
 #include "gdkscreen-x11.h"

diff --git a/gdk/x11/gdkeventsource.c b/gdk/x11/gdkeventsource.c
index 7131f31c95fbc4d4010e2152bd11493beb8fd7d6..5a39a5b59562bbb4cab088ca809403af83037dbc 100644 (file)
--- a/gdk/x11/gdkeventsource.c
+++ b/gdk/x11/gdkeventsource.c
@@ -19,7 +19,8 @@
 
 #include "gdkeventsource.h"
 
-#include "gdkinternals.h"
+#include "gdk/gdkeventsprivate.h"
+
 #include "gdksurface-x11.h"
 #include "gdkprivate-x11.h"
 #include "gdkdisplay-x11.h"

diff --git a/gdk/x11/gdkeventtranslator.h b/gdk/x11/gdkeventtranslator.h
index 2c4c415cb07822e864d8a702e3aa17096d8ccd50..4fcec6db0389ce63dd41bfbc40f1989d3a33632c 100644 (file)
--- a/gdk/x11/gdkeventtranslator.h
+++ b/gdk/x11/gdkeventtranslator.h
@@ -20,7 +20,8 @@
 
 #include "gdktypes.h"
 #include "gdkdisplay.h"
-#include "gdkinternals.h"
+
+#include "gdk/gdkdeviceprivate.h"
 
 #include <X11/Xlib.h>
 

diff --git a/gdk/x11/gdkglcontext-egl.c b/gdk/x11/gdkglcontext-egl.c
index 9e3301adf8eee1675e43efc8c25e01b73b2177e9..24375ecd4d60d1d9480c85f0e2a09ee4aa65ce2e 100644 (file)
--- a/gdk/x11/gdkglcontext-egl.c
+++ b/gdk/x11/gdkglcontext-egl.c
@@ -22,7 +22,6 @@
 #include "gdkx11property.h"
 #include <X11/Xatom.h>
 
-#include "gdkinternals.h"
 #include "gdkprofilerprivate.h"
 #include "gdkintl.h"
 

diff --git a/gdk/x11/gdkglcontext-glx.c b/gdk/x11/gdkglcontext-glx.c
index bc1eeb94fb02dc44cebb891d0a41a97a8c621637..c9667fbeed00092a64f0aabfdd7fb57829992e9a 100644 (file)
--- a/gdk/x11/gdkglcontext-glx.c
+++ b/gdk/x11/gdkglcontext-glx.c
@@ -22,7 +22,6 @@
 #include "gdkx11property.h"
 #include <X11/Xatom.h>
 
-#include "gdkinternals.h"
 #include "gdkprofilerprivate.h"
 #include "gdkintl.h"
 

diff --git a/gdk/x11/gdkglcontext-x11.c b/gdk/x11/gdkglcontext-x11.c
index d758066812ddbc783d0118c2cfaf6f173ebdc8b6..8c78e3c07e64f5e05074635c991fb00fb347b514 100644 (file)
--- a/gdk/x11/gdkglcontext-x11.c
+++ b/gdk/x11/gdkglcontext-x11.c
@@ -32,8 +32,6 @@
 #include "gdkx11property.h"
 #include <X11/Xatom.h>
 
-#include "gdkinternals.h"
-
 #include "gdkintl.h"
 
 #include <cairo-xlib.h>

diff --git a/gdk/x11/gdkglcontext-x11.h b/gdk/x11/gdkglcontext-x11.h
index 89bc03b5785361100c314b6c5eab9505e0d685c5..825efe11f9cf67258874ba3d59167e9f5dc73517 100644 (file)
--- a/gdk/x11/gdkglcontext-x11.h
+++ b/gdk/x11/gdkglcontext-x11.h
@@ -36,7 +36,6 @@
 #include "gdkglcontextprivate.h"
 #include "gdkdisplay-x11.h"
 #include "gdksurface.h"
-#include "gdkinternals.h"
 
 G_BEGIN_DECLS
 

diff --git a/gdk/x11/gdkmain-x11.c b/gdk/x11/gdkmain-x11.c
index 51f24ff1f30aaf68acceb0f0b13f0ce9557498de..c92e3858fe575ed32357cadd0786ed9975a087ee 100644 (file)
--- a/gdk/x11/gdkmain-x11.c
+++ b/gdk/x11/gdkmain-x11.c
@@ -25,7 +25,6 @@
 #include "config.h"
 
 #include "gdkdeviceprivate.h"
-#include "gdkinternals.h"
 #include "gdkintl.h"
 #include "gdkasync.h"
 #include "gdkdisplay-x11.h"
@@ -67,27 +66,6 @@ _gdk_x11_surfaceing_init (void)
   XSetIOErrorHandler (gdk_x_io_error);
 }
 
-GdkGrabStatus
-_gdk_x11_convert_grab_status (int status)
-{
-  switch (status)
-    {
-    case GrabSuccess:
-      return GDK_GRAB_SUCCESS;
-    case AlreadyGrabbed:
-      return GDK_GRAB_ALREADY_GRABBED;
-    case GrabInvalidTime:
-      return GDK_GRAB_INVALID_TIME;
-    case GrabNotViewable:
-      return GDK_GRAB_NOT_VIEWABLE;
-    case GrabFrozen:
-      return GDK_GRAB_FROZEN;
-    default:
-      g_assert_not_reached();
-      return 0;
-    }
-}
-
 /*
  * _gdk_x11_surface_grab_check_unmap:
  * @surface: a `GdkSurface`

diff --git a/gdk/x11/gdkprivate-x11.h b/gdk/x11/gdkprivate-x11.h
index 5a0f565f558746ef1bc660232861e3d1e2e69362..4461f15e6b3a3ad7315dcab3a09f43ace73d1d28 100644 (file)
--- a/gdk/x11/gdkprivate-x11.h
+++ b/gdk/x11/gdkprivate-x11.h
@@ -30,11 +30,13 @@
 #define __GDK_PRIVATE_X11_H__
 
 #include "gdkcursor.h"
-#include "gdkinternals.h"
 #include "gdkx.h"
 #include "gdksurface-x11.h"
 #include "gdkscreen-x11.h"
 
+#include "gdk/gdkdeviceprivate.h"
+#include "gdk/gdkkeysprivate.h"
+
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include <X11/extensions/XInput2.h>
@@ -239,8 +241,6 @@ void gdk_x11_surface_set_opacity (GdkSurface *surface,
                                   double      opacity);
 gboolean gdk_x11_surface_supports_edge_constraints (GdkSurface *surface);
 
-GdkGrabStatus _gdk_x11_convert_grab_status (int status);
-
 cairo_surface_t * _gdk_x11_display_create_bitmap_surface (GdkDisplay *display,
                                                           int         width,
                                                           int         height);

diff --git a/gdk/x11/gdkproperty-x11.c b/gdk/x11/gdkproperty-x11.c
index 056a1e96351d42b60ab9d03ef3471489ca2ca4e5..88dc856ca52af95d1a2c287a6ee880336a5b8a40 100644 (file)
--- a/gdk/x11/gdkproperty-x11.c
+++ b/gdk/x11/gdkproperty-x11.c
@@ -24,7 +24,6 @@
 
 #include "config.h"
 
-#include "gdkinternals.h"
 #include "gdkprivate-x11.h"
 #include "gdkdisplay-x11.h"
 #include "gdkscreen-x11.h"

diff --git a/gdk/x11/gdksurface-x11.c b/gdk/x11/gdksurface-x11.c
index dd1d0d3bd294659eb3bb24aafb2667a2ba423857..06bc9cf00e9ca65b5048d5ce1705324b7b8899ad 100644 (file)
--- a/gdk/x11/gdksurface-x11.c
+++ b/gdk/x11/gdksurface-x11.c
@@ -31,7 +31,6 @@
 #include "gdkpopupprivate.h"
 #include "gdktoplevelprivate.h"
 #include "gdkdragsurfaceprivate.h"
-#include "gdkinternals.h"
 #include "gdkdeviceprivate.h"
 #include "gdkdevice-xi2-private.h"
 #include "gdkframeclockidleprivate.h"
@@ -41,6 +40,8 @@
 #include "gdkglcontext-x11.h"
 #include "gdkprivate-x11.h"
 #include "gdktextureprivate.h"
+
+#include "gdkseatprivate.h"
 #include "gdk-private.h"
 
 #include <graphene.h>

diff --git a/gdk/x11/gdksurface-x11.h b/gdk/x11/gdksurface-x11.h
index a4c9e53e0a6aa4473da6923e2e493a5ee0bfa6c8..8a50b5b5d4731e2af23331064dca154b2c2f4b27 100644 (file)
--- a/gdk/x11/gdksurface-x11.h
+++ b/gdk/x11/gdksurface-x11.h
@@ -27,7 +27,6 @@
 
 #include "gdksurfaceprivate.h"
 #include "gdkx11surface.h"
-#include "gdkinternals.h"
 
 #include <X11/Xlib.h>
 

diff --git a/gdk/x11/gdkvulkancontext-x11.c b/gdk/x11/gdkvulkancontext-x11.c
index 002473e41f4ccd6bdebc042d634364180c6af31e..eb0270c596d91a21b155a7ed1093c80cadb70d1a 100644 (file)
--- a/gdk/x11/gdkvulkancontext-x11.c
+++ b/gdk/x11/gdkvulkancontext-x11.c
@@ -26,7 +26,6 @@
 
 #include "gdkvulkancontext-x11.h"
 
-#include "gdkinternals.h"
 #include "gdkdisplay-x11.h"
 #include "gdksurface-x11.h"
 

diff --git a/gdk/x11/gdkxftdefaults.c b/gdk/x11/gdkxftdefaults.c
index ef7580d4c0ca310faebb536e48c1ce10ee056fb4..2e745627ffdd06b356a7fa83cf26e82558480784 100644 (file)
--- a/gdk/x11/gdkxftdefaults.c
+++ b/gdk/x11/gdkxftdefaults.c
@@ -54,6 +54,8 @@
 #include <gdkscreen-x11.h>
 #include <gdkprivate-x11.h>
 
+#include "gdkdebug.h"
+
 static int
 parse_boolean (char *v)
 {

diff --git a/gdk/x11/xsettings-client.c b/gdk/x11/xsettings-client.c
index 2bab3c154f32961aedae497410d250b6151f9000..ac4811faa8e4de2f11f711b88b61df82ad29e06d 100644 (file)
--- a/gdk/x11/xsettings-client.c
+++ b/gdk/x11/xsettings-client.c
@@ -33,8 +33,6 @@
 #include <gdk/x11/gdkdisplay-x11.h>
 #include <gdk/x11/gdkscreen-x11.h>
 
-#include <gdkinternals.h>
-
 #include <string.h>
 
 #include <X11/Xlib.h>